Merge "Make lines shorter to pass phpcs under includes/libs"